From 6141f2dac888d0810e113c5896f96f6871dc41cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <ok@src.gnome.org>
Date: Fri, 9 Sep 2005 11:05:21 +0000
Subject: [PATCH] added error to BablConversion

---
 ChangeLog              |  6 ++++++
 babl/babl-classes.h    |  2 +-
 babl/babl-conversion.c | 17 ++---------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d755ec..064f3b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09  Øyvind Kolås  <pippin@gimp.org>
+
+	* babl/babl-classes.h: added error to BablConversion.
+	* babl/babl-conversion.c: (conversion_new), (babl_conversion_new):
+		track changes to fields in constructors.
+
 2005-09-08  Øyvind Kolås  <pippin@gimp.org>
 
 	* Makefile.am: build extensions before tests.
diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index a4e2989..6e340bf 100644
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -107,7 +107,7 @@ BablConversion {
   union Babl            *source;
   union Babl            *destination;
   int                    time_cost;
-  int                    loss;
+  double                 error;
   union
     {
       BablFuncLinear     linear;
diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 9a52b1b..7d419ef 100644
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -36,8 +36,6 @@ conversion_new (const char        *name,
                 int                id,
                 Babl              *source,
                 Babl              *destination,
-                int                time_cost,
-                int                loss,
                 BablFuncLinear     linear,
                 BablFuncPlane      plane, 
                 BablFuncPlanar     planar)
@@ -92,8 +90,7 @@ conversion_new (const char        *name,
   babl->instance.name          = babl_strdup (name);
   babl->conversion.source      = (union Babl*)source;
   babl->conversion.destination = (union Babl*)destination;
-  babl->conversion.time_cost   = time_cost;
-  babl->conversion.loss        = loss;
+  babl->conversion.error       = 0.0;
 
   babl->conversion.pixels      = 0;
   babl->conversion.processings = 0;
@@ -130,8 +127,6 @@ babl_conversion_new (void *first_arg,
   Babl              *babl;
 
   int                id          = 0;
-  int                time_cost   = 0;
-  int                loss        = 0;
   BablFuncLinear     linear      = NULL;
   BablFuncPlane      plane       = NULL;
   BablFuncPlanar     planar      = NULL;
@@ -185,14 +180,6 @@ babl_conversion_new (void *first_arg,
           planar = va_arg (varg, BablFuncPlanar);
         }
 
-      else if (!strcmp (arg, "time-cost"))
-        {
-          time_cost = va_arg (varg, int);
-        }
-      else if (!strcmp (arg, "loss"))
-        {
-          loss = va_arg (varg, int);
-        }
       else
         {
           babl_fatal ("unhandled argument '%s'", arg);
@@ -207,7 +194,7 @@ babl_conversion_new (void *first_arg,
   assert (destination);
 
   babl = conversion_new (create_name (source, destination),
-       id, source, destination, time_cost, loss, linear, plane, planar);
+       id, source, destination, linear, plane, planar);
 
   { 
     Babl *ret = babl_db_insert (db, babl);
-- 
2.30.2